From a5996efa8cedc9b8e556c4165583ea4479c3d1ff Mon Sep 17 00:00:00 2001
From: Ximin Luo <infinity0@debian.org>
Date: Thu, 20 Apr 2017 02:57:41 +0200
Subject: [PATCH] Refactor build targets, and add more documentation for our
 lack of tests

---
 debian/rules | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/rules b/debian/rules
index a2f8ef1a6..588f002e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,8 +25,6 @@ DEPSDIR := $(CURDIR)/deps
 
 override_dh_auto_configure:
 	cp -a $(CURDIR)/Cargo.lock $(CURDIR)/.Cargo.lock.orig
-
-override_dh_auto_build:
 ifneq ($(filter stage0,$(DEB_BUILD_PROFILES)),)
 	# Bootstrap cargo stage0
 	./debian/bootstrap.py \
@@ -51,6 +49,8 @@ endif
 		--enable-optimize \
 		--local-rust-root=/usr \
 		--cargo=$(CURDIR)/cargo-stage0
+
+override_dh_auto_build:
 	# Build final cargo binary and docs
 	$(MAKE)
 ifeq (,$(findstring nodoc,$(DEB_BUILD_PROFILES)))
@@ -58,6 +58,14 @@ ifeq (,$(findstring nodoc,$(DEB_BUILD_PROFILES)))
 	cd target/doc/ && rm -f jquery.js && ln -s /usr/share/javascript/jquery/jquery.js
 endif
 
+override_dh_auto_install:
+	# We pick stuff directly from target/
+
+override_dh_auto_test:
+	# We don't run tests at the moment, it can't find "cargotest" crate
+	# which seems to be part of the *rustc* source code :/
+	# https://github.com/rust-lang/rust/tree/master/src/tools/cargotest
+
 override_dh_auto_clean:
 	-mv $(CURDIR)/.Cargo.lock.orig $(CURDIR)/Cargo.lock
 	dh_auto_clean
@@ -72,10 +80,3 @@ override_dh_auto_clean:
 			$(CURDIR)/Makefile \
 			$(CURDIR)/cargo-stage0 \
 			$(VENDORDIR)
-
-override_dh_auto_install:
-	# We pick stuff directly from target/
-
-override_dh_auto_test:
-	# we don't run tests at the moment due to too many deps
-
-- 
2.30.2